Updated to latest rewrite.