further work on api change (wip)