Address review comments by Victor.