Changes from coding session 12/01/2014