Move logic optimizitaion
Suo commit
Fix commit