Add more version checking: t+