after review fixes