Add back version check