New: future-proofing