Changed numbering system to simplify ordering (again).