Updated comments for the new diagnostic mode