Changes from coding session 10/20/2014