change condition to move