Reorganized fixtures