moved some blocks around to make it more logical