Updates for Spring 2014 class