updated to devs 0.6 API