Adding code from August 18, 2012.