fixing after review