added code for two more wfsa types