Improve handling Repeat motions condition