WIP flattening and filling