back for round two and more mapping