Code changes for Jun-12-2013-13-08-29