simplify the selection boxes and use existing checks