tests
merge
Restored controls configuration. Removed grid spike