Made a couple of changes as a result of feedback from last workshop