Code changes for Jun-04-2013-16-59-48