this, and other similar changes, make the API synchronous