update to v0.5-RC3 API
wip