implemented changes for the tutorial