Implemented more feedback