Code changes for Jun-07-2013-13-03-44