updates after code review with sri