not a lot of changes.. moved a couple of lines