API 2 conversion

Have a look at what I did: