Implemented Donte's feedback