Future proof

Comments Welcome