Further improvements
Fixed conflicts