Implemented additional feedback from Max