Tim's slides
merging changes