add version numbers, remove Id