Updated spec (still ongoing).