Revised breaking references.
Final revision.