Updated to fix new var names.