fixed issues after review 1