Updated for CodeMash 2013