All but safeState method completed