smaller concurrency issues and warning elimination
add test mpds