moved a couple of lines