API v2

see previous comment.