Initial modifications from the 2013 codebase.