Final touches
Fixed merge conflicts