dave - more mappings