[*code review in progress] Perf stuff with motions. Ready to deploy