changes to the API (simplifying)