Code changes for Oct-15-2013-10-17-16