Implemented suggestions