fix - finish API conversion - WIP