Code changes for Jun-07-2013-12-59-36