commiting changes to as of 1/9/2013