Plan downgrade logic changed