Added functionality to option selection