Code changes for Oct-28-2013-15-18-32