Updated to jive with Knox's changes.