Second attempt at fixing movement from EK