Updated for loop to add additional 2 pins to Map