Movement handling added.