Added option for different behavior on target selection