work in progress
update api signature
fix lint errors
work in progress
update api signature
fix lint errors