dave - yet more mappings