More changes addressing Robert Sparks' review