Updated for HisWords 2.0