added heira setting back in