added support for 2 controllers and removed unused (test)code