Removed duplicated state and simplified selectable