Updating master of SHIVA to Bill's latest