Changes stated in comments