Eng 6880 concurrent access

Simplify here too.