needed to add more names to fancy new waifor function