Vision 20S and 25S upgrade (non ErP)