more changes -- just before ancestry gets added