Adding MOVEMENT_CORRECTION
Reorganizing some statements
Adjusting speed up