Refactored with baseCtrl