Adapted the version