Reworked movement slightly