enhanced Targeting

was #7274.  consolidated changes after rebase hickup