I made some modifications