Modularized controllers. Bug fix.