adding movement resolution bug