Small optimisation and removing of movement overlapping