moved some ; around