cleaned up movements to be better