Added Subcritical and Supercritical scenarios