Simplify state
Further simplify state
Green checkboxes!