Spirit2
Updated sources (clobbered)