WIP
Fixed conflicts