Final changes before starting rewrite.