Added LAP diagnostics