Code changes for Oct-14-2013-15-20-37