* updating master with new api