updated some structure to 1 and 2 moving sections between