moved some sections to a more logical place