Changes from coding session 11/03/2014