Future proofing!