Code changes for Jun-13-2013-10-09-58