Implemented some feedback