Wip/tutorials fix