More Content Section 3 and 5, Fixed Merge Conflicts