WIP: better segmentation for this application