work on restructured flushing