Fixed apply move - still need to reduce lines to 20