changed simulation structure