Added some changes
Some more changes