First pass at fixing concurrency issue
Reduce size of segment list