many changes after review