Changes due to comments