Rich's changes for SD2012