Removed version checking to make things simpler