diff --git a/sections/core/core.tex b/sections/core/core.tex
index b401046..610d3d2 100644
--- a/sections/core/core.tex
+++ b/sections/core/core.tex
@@ -6,7 +6,13 @@
 
 The core implements the \instrset{} architecture as specified by the RISC-V standard~\cite{riscv-spec-unprivileged}.
 
-It is constructed according to the traditional RISC pipeline:
+\begin{figure}[h]
+\includegraphics[width=\textwidth]{core_diagram.png}
+\caption{Block diagram of the CPU core}
+\label{fig:core-diagram}
+\end{figure}
+
+As can be seen in \ref{fig:core-diagram}, it is constructed according to the traditional stages of a RISC pipeline:
 
 \begin{description}
  \item[Fetch] fetches the next instruction from memory.
@@ -16,14 +22,6 @@ It is constructed according to the traditional RISC pipeline:
  \item[Writeback] stores a potential result value from Execute or Memory stages to the destination register.
 \end{description}
 
-\subsection{Overview}
-
-\begin{figure}
-%\includegraphics[width=\textwidth]{core_diagram.png}
-% TODO
-\caption{Block diagram of the CPU core}
-\end{figure}
-
 \subsection{Control}
 
 \entityheader{control}
diff --git a/sections/core/core_diagram.drawio b/sections/core/core_diagram.drawio
index 1d26d4a..949cbb0 100644
--- a/sections/core/core_diagram.drawio
+++ b/sections/core/core_diagram.drawio
@@ -1 +1 @@
-<mxfile host="www.draw.io" modified="2019-12-11T07:44:55.731Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.13.2 Chrome/73.0.3683.105 Safari/537.36" etag="cypgiirZT7mhMw4UHRcL" version="12.3.9" type="device" pages="1"><diagram id="-MZbLzNk5HDaKAr47o4G" name="Page-1">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</diagram></mxfile>
\ No newline at end of file
+<mxfile host="www.draw.io" modified="2020-03-30T19:50:01.047Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.14.1 Chrome/77.0.3865.129 Safari/537.36" etag="Bu3RFgc4ZeOEaW5U-Bph" version="12.9.1" type="device"><diagram name="Page-1" id="90a13364-a465-7bf4-72fc-28e22215d7a0">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</diagram></mxfile>
\ No newline at end of file
diff --git a/sections/core/core_diagram.png b/sections/core/core_diagram.png
index 46a770e..8378e62 100644
Binary files a/sections/core/core_diagram.png and b/sections/core/core_diagram.png differ