Added new switches in npudistbw to reflect Tristen's handiwork