Moved around a few varialbes.