Updated to have new VISION geometry.