Code changes for Oct-28-2013-15-41-57