Additional changes

Victor made these