Added investigate mapping and use dash