More work
Fixed merge conflicts