Update code to match the DTP 2013 workshop submission.