Code changes for Jun-30-2014-14-55-34