Tweaked a couple of my variables