moved some sections around