We've had a lot of success with praising desired behaviors rather than discipline of unwanted behaviors. Also, using 'think throughs' has been an effective teaching tool (ask the child to think through and say out loud what needs to be done etc)
Per: https://www.goodreads.com/book/show/14391149-calmer-easier-h...