more changes after review