Improvement changes

This references to "Improvement changes" #4