rework of the tutorial