Make it more future-proof.