updated mapping file based on 2/20 meeting with David