Adding more version checking code