Rearranged the sections for better flow