last changes for current API