updates to work with new, stratified, mirror-core