Continue refactoring kmotion3