added new base controller and removed defaults