some more updates to use the new api
0.9.1