HLMdiag now works as-is