finish first round of mapping integration