Add come changes to getMover() and animateMover()