Updating: minor improvement plus some addition.