Fixed remainder of tutorial