Updated to latest storemate, diagnostics