update to reflect current api
merged