Tweaking out some of the variable conditions