updates for new APIs