* Update FHA to support SAVI demo