Incorporate Victor's updates