To support ACL remark, need more polish.