Necessary changes

Hi, I've done the necessary changes that you've requested.