made changes occurding to comments