Trying to make the API more compatible with orig.