Added smart selection.