more mappings and results added