Final reworks