latest changes, moving around is implemented