Adam

controller and basecontroller error fixed