Made target selection more intelligent