upgraded wbapi