ADDED :ReOrdering class, and t4