Reworked variable logic a little more.