Updates we made during education session

Here's the updates we talked about. Approve this pull and merge into your own code.