Better keyboard controll when no movable
Sync with master