Updating latest code of SHIVA from Bill's repo