Changed order of some sections and removed what was deemed unneeded