following new 0.10 documentation