Code changes for Jun-06-2013-15-51-23