diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 41e0677..e08d20e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -89,7 +89,7 @@ RUN mkdir -p /home/vscode/.local/share/CMakeTools \
     && chown vscode:conda /home/vscode/.local/share/CMakeTools/cmake-tools-kits.json
 
 # Install the yardl tool
-ARG YARDL_VERSION=0.3.0
+ARG YARDL_VERSION=0.3.1
 RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57f4739..8163e9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
           mkdir ${YARDL_DIR}
           cd ${YARDL_DIR}
           echo "${{github.workspace}}/yardl" >> $GITHUB_PATH
-          YARDL_VERSION=0.3.0
+          YARDL_VERSION=0.3.1
           wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz"
           tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz"
           rm "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz"
diff --git a/cpp/prd_analysis.cpp b/cpp/prd_analysis.cpp
index 4c8af11..ad06808 100644
--- a/cpp/prd_analysis.cpp
+++ b/cpp/prd_analysis.cpp
@@ -29,6 +29,8 @@ main(int argc, char* argv[])
   if (header.exam) // only do this if present
     std::cout << "Subject ID: " << header.exam->subject.id << std::endl;
   std::cout << "Number of detectors: " << header.scanner.NumberOfDetectors() << std::endl;
+  std::cout << "Number of TOF bins: " << header.scanner.NumberOfTOFBins() << std::endl;
+  std::cout << "Number of energy bins: " <<header.scanner.NumberOfEnergyBins() << std::endl;
 
   const auto& tof_bin_edges = header.scanner.tof_bin_edges;
   std::cout << "TOF bin edges: " << tof_bin_edges << std::endl;
diff --git a/model/ScannerInformation.yml b/model/ScannerInformation.yml
index e5cdfba..99992c9 100644
--- a/model/ScannerInformation.yml
+++ b/model/ScannerInformation.yml
@@ -34,6 +34,5 @@ ScannerInformation: !record
 
   computedFields:
     numberOfDetectors: size(detectors)
-    # TODO: can we subtract 1 to get the number?
-    numberP1OfTOFBins: size(tofBinEdges)
-    numberP1OfEnergyBins: size(energyBinEdges)
+    numberOfTOFBins: size(tofBinEdges)-1
+    numberOfEnergyBins: size(energyBinEdges)-1
diff --git a/python/prd_analysis.py b/python/prd_analysis.py
index 3565aa9..a30d565 100644
--- a/python/prd_analysis.py
+++ b/python/prd_analysis.py
@@ -8,6 +8,8 @@
         header = reader.read_header()
         print(f"Subject ID: {header.exam.subject.id}")
         print(f"Number of detectors: {header.scanner.number_of_detectors()}")
+        print(f"Number of TOF bins: {header.scanner.number_of_tof_bins()}")
+        print(f"Number of energy bins: {header.scanner.number_of_energy_bins()}")
 
         energy_bin_edges = header.scanner.energy_bin_edges
         print(f"Energy bin edges: {energy_bin_edges}")