Some bug fixes causing multiple controllers
Merge conflict resolution