#198 started upadting tutorial code