intial changes done based on the comments change1