Move updates to Update(). Reinstate original movement logic.