Updated Option Selector