Updated for HWX

Tested using instructions from Steve Hubbell.