Attempt to make states more future-friendly