Adds changes from class 2014-10-31