Added selection ability
Added additional selection options