Yet more flattening
...