Work section
Fixed merge conflicts