T92 changes after code review