class 23 and 24 and code review details