changed movement handling