changes per latest review