Diamond disciplines reallocated to ensure fair qualification