some changes

I have added some changes here. Let me know if they work for you