some changes in GroupState andSimulation classes