added all tutorial modifications