Added some modifications