Re-worked parent client selection code