making changes to ensure we don't break the API