updates per 2013-10-01 changes from CJ. Code pulled from git