Lets make this future-proof