Before Diamond re-writing