Issue #47: Re-working the way that I'm checking the old variables

Signed-off-by: Elliot Voris <elliotfriend@gmail.com>