Made the tutorial work with 2.0