Before change of special case