first pass taking out too much bit of re-org