Tried to fix movement scheme