using new api everywhere