Made tutorial more robust