updated for ProductionBeast