Working code pre update for Spring 2015 semester