reorganized the fluff modifications