Reworked movement