Rework to handle september CVNP/MPSSC data.