Code changes for Oct-28-2013-10-28-58