Made some changes

I will make a pull request later.