API updated from June 7 discussion