reorganized fixtures