Update Hyde's changes as of 2013-10-14