code review with Mary changes