Modified and Added some changes