Use names for parts of state
Added selections