work on API 3 draft