started refactoring with new api