merged. with new motion on key 'Z'