diff --git a/res/simulation/Buffer_OP.pdf b/res/simulation/Buffer_OP.pdf
new file mode 100644
index 0000000..84f9617
Binary files /dev/null and b/res/simulation/Buffer_OP.pdf differ
diff --git a/res/simulation/Buffer_OP_MaxGain_vs_IC.csv b/res/simulation/Buffer_OP_MaxGain_vs_IC.csv
new file mode 100644
index 0000000..b2ddfbc
--- /dev/null
+++ b/res/simulation/Buffer_OP_MaxGain_vs_IC.csv
@@ -0,0 +1,47 @@
+IC,MaxGain
+0.500,-1.264
+0.600,0.062
+0.700,1.099
+0.800,1.935
+0.900,2.627
+1.000,3.211
+1.100,3.710
+1.200,4.142
+1.300,4.520
+1.400,6.224
+1.500,5.150
+1.600,6.737
+1.700,5.652
+1.800,5.865
+1.900,6.058
+2.000,7.462
+2.100,6.390
+2.200,7.717
+2.300,6.661
+2.400,6.777
+2.500,7.998
+2.600,8.068
+2.700,8.126
+2.800,8.173
+2.900,7.181
+3.000,8.231
+3.100,8.238
+3.200,7.276
+3.300,8.227
+3.400,8.212
+3.500,8.192
+3.600,8.166
+3.700,7.297
+3.800,8.099
+3.900,8.051
+4.000,7.982
+4.100,7.879
+4.200,7.704
+4.300,7.374
+4.400,6.730
+4.500,5.513
+4.600,3.406
+4.700,0.243
+4.800,-3.766
+4.900,-8.103
+5.000,-12.271
diff --git a/res/simulation/Buffer_OP_NFmin_vs_IC.csv b/res/simulation/Buffer_OP_NFmin_vs_IC.csv
new file mode 100644
index 0000000..045f0c1
--- /dev/null
+++ b/res/simulation/Buffer_OP_NFmin_vs_IC.csv
@@ -0,0 +1,47 @@
+IC,NFmin
+0.500,7.875
+0.600,6.955
+0.700,6.294
+0.800,5.799
+0.900,5.417
+1.000,5.115
+1.100,4.871
+1.200,4.672
+1.300,4.508
+1.400,3.826
+1.500,4.254
+1.600,3.663
+1.700,4.073
+1.800,4.002
+1.900,3.942
+2.000,3.475
+2.100,3.848
+2.200,3.426
+2.300,3.783
+2.400,3.759
+2.500,3.393
+2.600,3.390
+2.700,3.392
+2.800,3.397
+2.900,3.712
+3.000,3.419
+3.100,3.437
+3.200,3.737
+3.300,3.480
+3.400,3.504
+3.500,3.530
+3.600,3.558
+3.700,3.827
+3.800,3.618
+3.900,3.653
+4.000,3.693
+4.100,3.744
+4.200,3.815
+4.300,3.933
+4.400,4.156
+4.500,4.605
+4.600,5.527
+4.700,7.301
+4.800,10.178
+4.900,13.872
+5.000,17.750
diff --git a/res/simulation/INT_Buffer.pdf b/res/simulation/INT_Buffer.pdf
new file mode 100644
index 0000000..e71024a
Binary files /dev/null and b/res/simulation/INT_Buffer.pdf differ
diff --git a/res/simulation/INT_Buffer_ConvGain_vs_LOPow.csv b/res/simulation/INT_Buffer_ConvGain_vs_LOPow.csv
new file mode 100644
index 0000000..a8732f7
--- /dev/null
+++ b/res/simulation/INT_Buffer_ConvGain_vs_LOPow.csv
@@ -0,0 +1,62 @@
+LOPow,ConvGain
+-50.000,-3.271
+-49.000,-2.271
+-48.000,-1.271
+-47.000,-0.271
+-46.000,0.729
+-45.000,1.729
+-44.000,2.729
+-43.000,3.729
+-42.000,4.729
+-41.000,5.728
+-40.000,6.728
+-39.000,7.728
+-38.000,8.727
+-37.000,9.727
+-36.000,10.726
+-35.000,11.725
+-34.000,12.724
+-33.000,13.722
+-32.000,14.721
+-31.000,15.718
+-30.000,16.715
+-29.000,17.712
+-28.000,18.707
+-27.000,19.702
+-26.000,20.694
+-25.000,21.685
+-24.000,22.674
+-23.000,23.660
+-22.000,24.642
+-21.000,25.619
+-20.000,26.590
+-19.000,27.554
+-18.000,28.509
+-17.000,29.452
+-16.000,30.381
+-15.000,31.291
+-14.000,32.179
+-13.000,33.038
+-12.000,33.862
+-11.000,34.642
+-10.000,35.368
+-9.000,36.028
+-8.000,36.608
+-7.000,37.097
+-6.000,37.486
+-5.000,37.774
+-4.000,37.962
+-3.000,38.032
+-2.000,37.675
+-1.000,29.063
+0.000,1.882
+1.000,1.334
+2.000,2.327
+3.000,3.926
+4.000,3.626
+5.000,1.855
+6.000,-0.575
+7.000,-2.637
+8.000,-5.165
+9.000,-8.281
+10.000,-10.584
diff --git a/res/simulation/INT_Buffer_ConvGain_vs_RFFreq.csv b/res/simulation/INT_Buffer_ConvGain_vs_RFFreq.csv
new file mode 100644
index 0000000..457abec
--- /dev/null
+++ b/res/simulation/INT_Buffer_ConvGain_vs_RFFreq.csv
@@ -0,0 +1,32 @@
+RFFreq,ConvGain
+110.000,37.925
+112.000,38.274
+114.000,38.500
+116.000,38.627
+118.000,38.661
+120.000,38.607
+122.000,38.482
+124.000,38.322
+126.000,38.153
+128.000,37.990
+130.000,37.844
+132.000,37.729
+134.000,37.660
+136.000,37.645
+138.000,37.685
+140.000,37.774
+142.000,37.897
+144.000,38.038
+146.000,38.184
+148.000,38.319
+150.000,38.416
+152.000,38.441
+154.000,38.374
+156.000,38.206
+158.000,37.924
+160.000,37.504
+162.000,36.917
+164.000,36.141
+166.000,35.174
+168.000,34.038
+170.000,32.768
diff --git a/res/simulation/INT_Buffer_ConvGain_vs_RFPow.csv b/res/simulation/INT_Buffer_ConvGain_vs_RFPow.csv
new file mode 100644
index 0000000..f234a10
--- /dev/null
+++ b/res/simulation/INT_Buffer_ConvGain_vs_RFPow.csv
@@ -0,0 +1,34 @@
+RFPow,ConvGain
+-60.000,18.951
+-57.500,21.446
+-55.000,23.937
+-52.500,26.420
+-50.000,28.889
+-47.500,31.331
+-45.000,33.716
+-42.500,35.961
+-40.000,37.774
+-37.500,38.694
+-35.000,39.219
+-32.500,39.736
+-30.000,40.225
+-27.500,40.510
+-25.000,40.610
+-22.500,40.672
+-20.000,40.734
+-17.500,40.797
+-15.000,40.849
+-12.500,40.904
+-10.000,40.965
+-7.500,41.019
+-5.000,41.043
+-2.500,41.016
+0.000,40.834
+2.500,35.972
+5.000,27.649
+7.500,16.001
+10.000,12.795
+12.500,10.636
+15.000,8.589
+17.500,6.231
+20.000,3.318
diff --git a/res/simulation/INT_Buffer_noise.csv b/res/simulation/INT_Buffer_noise.csv
new file mode 100644
index 0000000..7d2a105
--- /dev/null
+++ b/res/simulation/INT_Buffer_noise.csv
@@ -0,0 +1,32 @@
+f,NF
+0.0000,9.772
+1.000,9.823
+2.000,9.828
+3.000,9.834
+4.000,9.842
+5.000,10.380
+6.000,9.860
+7.000,9.870
+8.000,9.881
+9.000,9.892
+10.00,9.999
+11.00,9.917
+12.00,9.931
+13.00,9.946
+14.00,9.963
+15.00,9.982
+16.00,10.002
+17.00,10.024
+18.00,10.048
+19.00,10.073
+20.00,10.100
+21.00,10.129
+22.00,10.159
+23.00,10.191
+24.00,10.224
+25.00,10.259
+26.00,10.295
+27.00,10.331
+28.00,10.369
+29.00,10.407
+30.00,10.446
diff --git a/res/simulation/INT_SQuad_TIA_01.pdf b/res/simulation/INT_SQuad_TIA_01.pdf
index 5a47526..5751bc2 100644
Binary files a/res/simulation/INT_SQuad_TIA_01.pdf and b/res/simulation/INT_SQuad_TIA_01.pdf differ
diff --git a/res/simulation/INT_SQuad_TIA_noise.csv b/res/simulation/INT_SQuad_TIA_noise.csv
new file mode 100644
index 0000000..a199e43
--- /dev/null
+++ b/res/simulation/INT_SQuad_TIA_noise.csv
@@ -0,0 +1,32 @@
+f,NF
+0.0000,9.498
+1.000,9.629
+2.000,9.635
+3.000,9.644
+4.000,9.655
+5.000,10.468
+6.000,9.680
+7.000,9.694
+8.000,9.708
+9.000,9.722
+10.00,9.737
+11.00,9.753
+12.00,9.769
+13.00,9.787
+14.00,9.805
+15.00,9.824
+16.00,9.844
+17.00,9.865
+18.00,9.887
+19.00,9.910
+20.00,9.934
+21.00,9.959
+22.00,9.984
+23.00,10.011
+24.00,10.039
+25.00,10.068
+26.00,10.097
+27.00,10.128
+28.00,10.159
+29.00,10.191
+30.00,10.224
diff --git a/res/simulation/SQuad_OP_01.pdf b/res/simulation/SQuad_OP_01.pdf
index f350c83..fb9b467 100644
Binary files a/res/simulation/SQuad_OP_01.pdf and b/res/simulation/SQuad_OP_01.pdf differ
diff --git a/res/simulation/TIA_OP_01.pdf b/res/simulation/TIA_OP_01.pdf
index 6320f1a..5857201 100644
Binary files a/res/simulation/TIA_OP_01.pdf and b/res/simulation/TIA_OP_01.pdf differ
diff --git a/res/simulation/TIA_OP_MaxGain_vs_IC.csv b/res/simulation/TIA_OP_MaxGain_vs_IC.csv
index d04417d..bd2f300 100644
--- a/res/simulation/TIA_OP_MaxGain_vs_IC.csv
+++ b/res/simulation/TIA_OP_MaxGain_vs_IC.csv
@@ -1,22 +1,82 @@
 IC,MaxGain
 0.000,-10.280
+0.250,0.128
+0.500,4.561
+0.750,7.103
 1.000,8.917
+1.250,10.441
+1.500,12.014
+1.750,12.541
 2.000,12.983
+2.250,13.362
+2.500,13.690
+2.750,13.979
 3.000,14.234
+3.250,14.461
+3.500,14.665
+3.750,14.848
 4.000,15.014
+4.250,15.165
+4.500,15.301
+4.750,15.423
 5.000,15.532
+5.250,15.627
+5.500,15.710
+5.750,15.778
 6.000,15.826
+6.250,15.848
+6.500,15.834
+6.750,15.810
 7.000,15.781
+7.250,15.730
+7.500,15.534
+7.750,14.484
 8.000,6.676
+8.250,-1.975
+8.500,-8.829
+8.750,-12.587
 9.000,-13.801
+9.250,-14.111
+9.500,-14.178
+9.750,-14.175
 10.000,-14.153
+10.250,-14.126
+10.500,-14.099
+10.750,-14.073
 11.000,-14.050
+11.250,-14.028
+11.500,-13.983
+11.750,-13.934
 12.000,-13.892
+12.250,-13.855
+12.500,-13.823
+12.750,-13.795
 13.000,-13.770
+13.250,-13.747
+13.500,-13.727
+13.750,-13.708
 14.000,-13.692
+14.250,-13.677
+14.500,-13.663
+14.750,-13.650
 15.000,-13.638
+15.250,-13.627
+15.500,-13.617
+15.750,-13.608
 16.000,-13.599
+16.250,-13.591
+16.500,-13.584
+16.750,-13.577
 17.000,-13.571
+17.250,-13.565
+17.500,-13.559
+17.750,-13.554
 18.000,-13.549
+18.250,-13.544
+18.500,-13.540
+18.750,-13.536
 19.000,-13.533
+19.250,-13.529
+19.500,-13.526
+19.750,-13.523
 20.000,-13.521
diff --git a/res/simulation/TIA_OP_NFmin_vs_IC.csv b/res/simulation/TIA_OP_NFmin_vs_IC.csv
index 82a41a3..3a6c9f8 100644
--- a/res/simulation/TIA_OP_NFmin_vs_IC.csv
+++ b/res/simulation/TIA_OP_NFmin_vs_IC.csv
@@ -1,22 +1,82 @@
 IC,NFmin
 0.000,10.630
+0.250,5.617
+0.500,4.326
+0.750,3.812
 1.000,3.534
+1.250,3.358
+1.500,3.237
+1.750,3.148
 2.000,3.080
+2.250,3.025
+2.500,2.980
+2.750,2.943
 3.000,2.911
+3.250,2.884
+3.500,2.860
+3.750,2.839
 4.000,2.819
+4.250,2.801
+4.500,2.785
+4.750,2.770
 5.000,2.756
+5.250,2.743
+5.500,2.731
+5.750,2.719
 6.000,2.708
+6.250,2.698
+6.500,2.688
+6.750,2.678
 7.000,2.669
+7.250,2.662
+7.500,2.660
+7.750,2.705
 8.000,3.154
+8.250,5.383
+8.500,9.639
+8.750,12.812
 9.000,13.919
+9.250,14.211
+9.500,14.277
+9.750,14.279
 10.000,14.262
+10.250,14.240
+10.500,14.217
+10.750,14.197
 11.000,14.178
+11.250,14.161
+11.500,14.121
+11.750,14.079
 12.000,14.043
+12.250,14.012
+12.500,13.987
+12.750,13.965
 13.000,13.946
+13.250,13.930
+13.500,13.915
+13.750,13.903
 14.000,13.893
+14.250,13.884
+14.500,13.876
+14.750,13.869
 15.000,13.863
+15.250,13.858
+15.500,13.854
+15.750,13.851
 16.000,13.848
+16.250,13.845
+16.500,13.844
+16.750,13.843
 17.000,13.842
+17.250,13.841
+17.500,13.842
+17.750,13.842
 18.000,13.843
+18.250,13.844
+18.500,13.845
+18.750,13.847
 19.000,13.849
+19.250,13.851
+19.500,13.853
+19.750,13.856
 20.000,13.859
diff --git a/sections/03_simulation_results.tex b/sections/03_simulation_results.tex
index ad11a1e..132183b 100644
--- a/sections/03_simulation_results.tex
+++ b/sections/03_simulation_results.tex
@@ -75,8 +75,8 @@
 						height=0.75\textwidth,
 						xlabel={$V_\text{BE}\ (\text{V})$},
 						ylabel={$\mathit{s_\text{21}}\ (\text{dB})$},
-                        ytick={-50,-40,...,0,10},
-                        xtick={0.5,0.6,...,1.2},
+						ytick={-50,-40,...,0,10},
+						xtick={0.5,0.6,...,1.2},
 						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
@@ -93,8 +93,8 @@
 						height=0.75\textwidth,
 						xlabel={$V_\text{BE}\ (\text{V})$},
 						ylabel={$\mathit{NF}_\text{dsb}\ (\text{dB})$},
-                        ytick={0,10,...,60},
-                        xtick={0.5,0.6,...,1.2},
+						ytick={0,10,...,60},
+						xtick={0.5,0.6,...,1.2},
 						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
@@ -109,7 +109,7 @@
 	\vspace*{-2mm}
 	\begin{itemize}
 		\item Plotted for $f_\text{LO}=\SI{135}{GHz}, f_\text{RF}=\SI{140}{GHz}$
-		\item Double-sideband noise figure (direct conversion mixer)
+		\item Double-sideband noise figure $\mathit{NF}_\text{dsb}$ (direct conversion mixer)
 		\item Chosen operating point: $V_\text{BE} = \SI{0.8}{V}$
 	\end{itemize}
 \end{frame}
@@ -162,9 +162,9 @@
 						height=0.75\textwidth,
 						xlabel={$I_\text{C}\ (\text{mA})$},
 						ylabel={$\mathit{MAG}\ (\text{dB})$},
-						grid, 
-                        xtick={0,2,...,20},
-                        ytick={-15, -10, ..., 15},
+						grid,
+						xtick={0,2,...,20},
+						ytick={-15, -10, ..., 15},
 					]
 					\addplot+[mark=none, line width=1pt]
 					table[col sep=comma, x=IC, y=MaxGain]
@@ -180,8 +180,8 @@
 						height=0.75\textwidth,
 						xlabel={$I_\text{C}\ (\text{mA})$},
 						ylabel={$\mathit{NF}_\text{min}\ (\text{dB})$},
-                        xtick={0,2,...,20},
-                        ytick={0,2,...,16},
+						xtick={0,2,...,20},
+						ytick={0,2,...,16},
 						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
@@ -217,7 +217,6 @@
 				      \item Exact value of supply voltage not crucial at this point
 				      \item S-parameter simulation: Examination of $\mathit{MAG}$ and $\mathit{NF}_\text{min}$
 				      \item \textbf{Note}: Adjustment with respect to linearity at the very end
-				      \item [TODO] Switch figure with correct one (add peaking inductance)
 			      \end{itemize}
 		\end{itemize}
 	\end{minipage}%
@@ -225,7 +224,7 @@
 		\vspace*{-5mm}
 		\begin{figure}[H]
 			\hspace*{2mm}%
-			\includegraphics[width=1\textwidth]{res/simulation/Buffer.pdf}
+			\includegraphics[width=1\textwidth]{res/simulation/Buffer_OP.pdf}
 		\end{figure}
 	\end{minipage}
 \end{frame}
@@ -236,34 +235,47 @@
 	\begin{figure}
 		\centering
 		\begin{subfigure}{0.5\textwidth}
-			\centering
 			\begin{tikzpicture}
 				\begin{axis}[
-						domain=-5:5,
 						width=\textwidth,
 						height=0.75\textwidth,
-						samples=100,
+						xlabel={$I_\text{C}\ (\text{mA})$},
+						ylabel={$\mathit{MAG}\ (\text{dB})$},
+						grid,
+						xtick={0.5,1,...,5},
+						ytick={-20, -15, ..., 20},
 					]
 					\addplot+[mark=none, line width=1pt]
-					{ln(x)};
+					table[col sep=comma, x=IC, y=MaxGain]
+						{res/simulation/Buffer_OP_MaxGain_vs_IC.csv};
+					\addplot[mark=*] coordinates {(3,8.231)} node[pin=-100:{Q}]{} ;
 				\end{axis}
 			\end{tikzpicture}
 		\end{subfigure}%
 		\begin{subfigure}{0.5\textwidth}
-			\centering
 			\begin{tikzpicture}
 				\begin{axis}[
-						domain=-.1:.1,
 						width=\textwidth,
 						height=0.75\textwidth,
-						samples=100,
+						xlabel={$I_\text{C}\ (\text{mA})$},
+						ylabel={$\mathit{NF}_\text{min}\ (\text{dB})$},
+						xtick={0.5,1,...,5},
+						ytick={0,2,...,22},
+						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
-					{tanh(deg(x))};
+					table[col sep=comma, x=IC, y=NFmin]
+						{res/simulation/Buffer_OP_NFmin_vs_IC.csv};
+					\addplot[mark=*] coordinates {(3,3.419)} node[pin=100:{Q}]{} ;
 				\end{axis}
 			\end{tikzpicture}
 		\end{subfigure}
 	\end{figure}
+
+	\begin{itemize}
+		\item Plotted for $f_\text{IF} = \SI{20}{GHz}$
+		\item Chosen operating point: $I_\text{C} = \SI{3}{mA}$
+	\end{itemize}
 \end{frame}
 
 \begin{frame}
@@ -299,7 +311,7 @@
 \begin{frame}
 	\frametitle{Integration: SQuad \& TIA}
 
-    \vspace*{-6mm}
+	\vspace*{-6mm}
 	\begin{figure}
 		\begin{subfigure}{0.5\textwidth}
 			\begin{tikzpicture}
@@ -309,8 +321,8 @@
 						ylabel={Conversion Gain (dB)},
 						xlabel={$P_\text{LO}\ (\text{dBm})$},
 						grid,
-                        xtick={-50,-40,...,10},
-                        ytick={-40,-30,...,10},
+						xtick={-50,-40,...,10},
+						ytick={-40,-30,...,10},
 					]
 					\addplot+[mark=none, line width=1pt]
 					table[col sep=comma, x=LOPow, y=ConvGain]
@@ -320,24 +332,25 @@
 			\end{tikzpicture}
 		\end{subfigure}%
 		\begin{subfigure}{0.5\textwidth}
+			\hspace*{2mm}
 			\begin{tikzpicture}
 				\begin{axis}[
 						width=\textwidth,
 						height=0.5\textwidth,
 						ylabel={Conversion Gain (dB)},
-						xlabel={$P_\text{RF}\ (\text{dBm})$},
-                        xtick={-60,-50,...,20},
-                        ytick={-20,-10,...,30},
+						xlabel={$f_\text{RF}\ (\text{GHz})$},
+						xtick={-110,-100,...,170},
+						ytick={-10,-8,...,10},
 						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
-					table[col sep=comma, x=RFPow, y=ConvGain]
-						{res/simulation/INT_SQuad_TIA_ConvGain_vs_RFPow.csv};
-					\node[scol2,circle,fill,inner sep=2pt] at (axis cs:-20,28.073) {};
-					\addplot[mark=*] coordinates {(-20,28.073)} node[pin=-80:{$P_{\SI{1}{dB}}$}]{} ;
+					table[col sep=comma, x=RFFreq, y=ConvGain]
+						{res/simulation/INT_SQuad_TIA_ConvGain_vs_RFFreq.csv};
+					\draw[dashed] (axis cs:135, 0) -- (axis cs:135,12);
+					\node at (axis cs:147,1.25) {$f_\text{LO} = \SI{135}{GHz}$};
 				\end{axis}
 			\end{tikzpicture}
-		\end{subfigure}
+		\end{subfigure}%
 
 		\begin{subfigure}{0.5\textwidth}
 			\begin{tikzpicture}
@@ -345,14 +358,34 @@
 						width=\textwidth,
 						height=0.5\textwidth,
 						ylabel={Conversion Gain (dB)},
-						xlabel={$f_\text{RF}\ (\text{GHz})$},
-                        xtick={-110,-100,...,170},
-                        ytick={-10,-8,...,10},
+						xlabel={$P_\text{RF}\ (\text{dBm})$},
+						xtick={-60,-50,...,20},
+						ytick={-20,-10,...,30},
 						grid,
 					]
 					\addplot+[mark=none, line width=1pt]
-					table[col sep=comma, x=RFFreq, y=ConvGain]
-						{res/simulation/INT_SQuad_TIA_ConvGain_vs_RFFreq.csv};
+					table[col sep=comma, x=RFPow, y=ConvGain]
+						{res/simulation/INT_SQuad_TIA_ConvGain_vs_RFPow.csv};
+					\addplot[mark=*] coordinates {(-20,28.073)} node[pin=-80:{$P_{\SI{1}{dB}}$}]{} ;
+				\end{axis}
+			\end{tikzpicture}
+		\end{subfigure}%
+		\begin{subfigure}{0.5\textwidth}
+			\begin{tikzpicture}
+				\begin{axis}[
+						width=\textwidth,
+						height=0.5\textwidth,
+						ylabel={$\mathit{NF}_\text{dsb}\ (\text{dB})$},
+						xlabel={$f_\text{IF}\ (\text{GHz})$},
+						xtick={0,5,...,30},
+						ytick={9.4,9.6,...,10.8},
+						grid,
+					]
+					\addplot+[mark=none, line width=1pt]
+					table[col sep=comma, x=f, y=NF]
+						{res/simulation/INT_SQuad_TIA_noise.csv};
+					\draw[dashed] (axis cs:135, 0) -- (axis cs:135,12);
+					\node at (axis cs:147,1.25) {$f_\text{LO} = \SI{135}{GHz}$};
 				\end{axis}
 			\end{tikzpicture}
 		\end{subfigure}%
@@ -362,17 +395,108 @@
 \begin{frame}
 	\frametitle{Integration: SQuad, TIA \& Buffer}
 
-	\begin{itemize}
-		\item AC coupling $\rightarrow$ No redesign of bias circuitry required
-	\end{itemize}
+	\begin{minipage}{0.6\textwidth}
+		\begin{itemize}
+			\item DC coupling $\rightarrow$ Redesign of bias circuitry
+			\item Supply voltage fixed to $\SI{2.5}{\volt}$
+			\item Examination using Harmonic-Balance simulation:
+			      \begin{itemize}
+				      \item Conversion gain
+				      \item $\SI{1}{dB}$ compression point ($P_{\SI{1}{dB}}$)
+			      \end{itemize}
+		\end{itemize}
+	\end{minipage}%
+	\begin{minipage}{0.4\textwidth}
+		\vspace*{-5mm}
+		\begin{figure}[H]
+			\includegraphics[width=0.9\textwidth]{res/simulation/INT_Buffer.pdf}
+		\end{figure}
+	\end{minipage}
 \end{frame}
 
 \begin{frame}
 	\frametitle{Integration: SQuad, TIA \& Buffer}
 
-	\begin{itemize}
-		\item [TODO] Plots
-	\end{itemize}
+	\vspace*{-6mm}
+	\begin{figure}
+		\begin{subfigure}{0.5\textwidth}
+			\begin{tikzpicture}
+				\begin{axis}[
+						width=\textwidth,
+						height=0.5\textwidth,
+						ylabel={Conversion Gain (dB)},
+						xlabel={$P_\text{LO}\ (\text{dBm})$},
+						grid,
+						xtick={-50,-40,...,10},
+						ytick={-20,-10,...,40},
+					]
+					\addplot+[mark=none, line width=1pt]
+					table[col sep=comma, x=LOPow, y=ConvGain]
+						{res/simulation/INT_Buffer_ConvGain_vs_LOPow.csv};
+					\addplot[mark=*] coordinates {(-5,37.774)} node[pin=-100:{OP}]{} ;
+				\end{axis}
+			\end{tikzpicture}
+		\end{subfigure}%
+		\begin{subfigure}{0.5\textwidth}
+            \hspace{2mm}
+			\begin{tikzpicture}
+				\begin{axis}[
+						width=\textwidth,
+						height=0.5\textwidth,
+						ylabel={Conversion Gain (dB)},
+						xlabel={$f_\text{RF}\ (\text{GHz})$},
+						xtick={-110,-100,...,170},
+						ytick={20,22,...,40},
+						grid,
+					]
+					\addplot+[mark=none, line width=1pt]
+					table[col sep=comma, x=RFFreq, y=ConvGain]
+						{res/simulation/INT_Buffer_ConvGain_vs_RFFreq.csv};
+					\draw[dashed] (axis cs:135, 30) -- (axis cs:135,40);
+					\node at (axis cs:147,33) {$f_\text{LO} = \SI{135}{GHz}$};
+				\end{axis}
+			\end{tikzpicture}
+		\end{subfigure}%
+
+		\begin{subfigure}{0.5\textwidth}
+            \hspace{1.5mm}
+			\begin{tikzpicture}
+				\begin{axis}[
+						width=\textwidth,
+						height=0.5\textwidth,
+						ylabel={Conversion Gain (dB)},
+						xlabel={$P_\text{RF}\ (\text{dBm})$},
+						xtick={-60,-50,...,20},
+						ytick={-10,0,...,40},
+						grid,
+					]
+					\addplot+[mark=none, line width=1pt]
+					table[col sep=comma, x=RFPow, y=ConvGain]
+						{res/simulation/INT_Buffer_ConvGain_vs_RFPow.csv};
+					\addplot[mark=*] coordinates {(-40,37.774)} node[pin=-80:{$P_{\SI{1}{dB}}$}]{} ;
+				\end{axis}
+			\end{tikzpicture}
+		\end{subfigure}%
+		\begin{subfigure}{0.5\textwidth}
+			\begin{tikzpicture}
+				\begin{axis}[
+						width=\textwidth,
+						height=0.5\textwidth,
+						ylabel={$\mathit{NF}_\text{dsb}\ (\text{dB})$},
+						xlabel={$f_\text{IF}\ (\text{GHz})$},
+						xtick={0,5,...,30},
+						ytick={9.4,9.6,...,10.8},
+						grid,
+					]
+					\addplot+[mark=none, line width=1pt]
+					table[col sep=comma, x=f, y=NF]
+						{res/simulation/INT_Buffer_noise.csv};
+					\draw[dashed] (axis cs:135, 0) -- (axis cs:135,12);
+					\node at (axis cs:147,1.25) {$f_\text{LO} = \SI{135}{GHz}$};
+				\end{axis}
+			\end{tikzpicture}
+		\end{subfigure}%
+	\end{figure}
 \end{frame}
 
 \begin{frame}
diff --git a/sections/05_conclusion.tex b/sections/05_conclusion.tex
index f27f750..fc24d6b 100644
--- a/sections/05_conclusion.tex
+++ b/sections/05_conclusion.tex
@@ -1,16 +1,28 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Conclusion}
+\section{Discussion \& Conclusion}
 
 \begin{frame}
-	\frametitle{Conclusion}
+	\frametitle{Discussion \& Conclusion}
 
 	\begin{itemize}
-        \item Removal of $g_\text{m}$ stage of Gilbert cell for more voltage headroom
-        \item Usage of high bandwidth TIA and inductive peaking
-        \item Differential to single-ended conversion for dense chip-to-package transition
-		\item [TODO] Applications of proposed design (why specifically 5G?)
+		\item Mixer structure
 		      \begin{itemize}
-                  \item [TODO] Are BiCMOS devices, e.g., particularly cheap or easily scalable?
+			      \item Removal of $g_\text{m}$ stage of Gilbert cell $\rightarrow$ more voltage headroom
+			      \item High bandwidth TIA and inductive peaking $\rightarrow$ high bandwidth
+			      \item Differential to single-ended conversion $\rightarrow$ dense chip-to-package transition
+		      \end{itemize}
+		      \bigskip
+		\item Own simulations
+		      \begin{itemize}
+			      \item Much higher conversion gain $\leftarrow$ technology with higher $f_\text{t}$ and $f_\text{max}$, no stability considerations
+		      \end{itemize}
+		      \bigskip
+		\item Applications of this design
+		      \begin{itemize}
+			      \item [TODO] Applications of proposed design (why specifically 5G?)
+			            \begin{itemize}
+				            \item [TODO] Are BiCMOS devices, e.g., particularly cheap or easily scalable?
+			            \end{itemize}
 		      \end{itemize}
 	\end{itemize}
 \end{frame}