Added selectable logic