Refactor for tAPI!