Before class commit; 12-4-2013