adding controller, cleanup