Tweaked a couple of lines