reflecting latest api changes