Code changes for Oct-31-2013-15-30-41