Final rework commit