These vars no longer seem to exist in the updated function.