Adding code from August 12, 2012.