Updating to latest SHIVA code from Bill