now using updated pinmapping