updated with new public api