latest api changes, working on apache pivot prototype