More LAP diagnostic revision