More changes
Fixed conflicts