changed movement implementation (also test commit)