updated mappings from Vicki