Motion fix, Controller fix

Fix