changes done as per mail