Additional changes and requests as by subv