implementing suggestions on report after review 1