changes for second code review