ig, remove restart from sa as it should be externalized, rename variables in pii to be more coherent