More changes after review