Complete feature create complex motions
Refactor code