Reorganized sch a bit