Tutorial refactored
Merge