Commit of old code from spring 2012