Adds changes from class 2014-11-11