The check on version could be put here as well