Roo rework