Formatting
Introduce union withon Area
update store