Updated for semi-stable