moved a couple things around