Updating to use new var names