rev2 completed adding all entities