changes are  done as accordingly as your suggestion