(master) updating API to match reality