case 2525 - Code review notes.