probably final tutorial modifications