Work on logic, API change again