Code changes for Jul-16-2013-09-54-29