Made some modifications
More changes