Made some changes
More changes