updated up through Spring 2014 class