More changes
Solved conflict