phase1: make populateTargets() branch aware