Multidom
Diagnostics and other changes