updated and reorganized pop-rock harmony