Start of tutorial rework