Implemented suggestions 1/2