Updating: minor improvement and addition.