done with future proofing