changed movement code orga a bit