Current stuff
Fixed conflicts