I like that, seems much more helpful, I also think this class does really well to utilise the action economy without stepping on its other features!