reorganized the way i want it