More changes per review