- Reimplement functions 350, 351, 352 to use appropriate W functions