diff --git a/NAMESPACE b/NAMESPACE
index a25246ba..c8d654dc 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -172,6 +172,7 @@ export(nonmem2rx)
 export(nonmemControl)
 export(pkncaControl)
 export(popedControl)
+export(popedGetMultipleEndpointModelingTimes)
 export(popedMultipleEndpointIndexDataFrame)
 export(popedMultipleEndpointParam)
 export(popedMultipleEndpointResetTimeIndex)
diff --git a/R/RcppExports.R b/R/RcppExports.R
index cffb4d60..97659764 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -34,8 +34,11 @@ convertDataBack <- function(id, time, amt, ii, evid, cmt, cmtDvid, dvidDvid, lin
 #'
 #' @return A numeric vector of unique times.
 #'
+#' @export
+#'
 #' @examples
 #'
+#'
 #' \donttest{
 #'
 #' times <- c(1.1, 1.2, 1.3, 2.1, 2.2, 3.1)
@@ -55,7 +58,7 @@ convertDataBack <- function(id, time, amt, ii, evid, cmt, cmtDvid, dvidDvid, lin
 #' sortedTimes <- popedGetMultipleEndpointModelingTimes(times, modelSwitch, TRUE)
 #' print(sortedTimes)
 #'
-#' popedMultipleEndpointIndexDataFrame()
+#' popedMultipleEndpointIndexDataFrame(TRUE) # Print to show individual matching
 #'
 #' }
 popedGetMultipleEndpointModelingTimes <- function(times, modelSwitch, sorted = FALSE) {
@@ -75,7 +78,7 @@ popedGetMultipleEndpointModelingTimes <- function(times, modelSwitch, sorted = F
 #'
 #' @examples
 #'
-#' \dontrun{
+#' \donttest{
 #'
 #' popedMultipleEndpointResetTimeIndex()
 #'
@@ -121,7 +124,8 @@ popedMultipleEndpointIndexDataFrame <- function(print = FALSE) {
 #'    filled with the maximum time.
 #'
 #' @examples
-#' \dontrun{
+#'
+#' \donttest{
 #'
 #' p <- c(1.0, 2.0, 3.0)
 #' times <- c(0.5, 1.5, 2.5)
diff --git a/man/babel.poped.database.Rd b/man/babel.poped.database.Rd
index 08f9d9a2..3bceb1b4 100644
--- a/man/babel.poped.database.Rd
+++ b/man/babel.poped.database.Rd
@@ -4,7 +4,7 @@
 \alias{babel.poped.database}
 \title{Expand a babelmixr2 PopED database}
 \usage{
-babel.poped.database(popedInput, ...)
+babel.poped.database(popedInput, ..., optTime = NA)
 }
 \arguments{
 \item{popedInput}{The babelmixr2 generated PopED database}
diff --git a/man/popedControl.Rd b/man/popedControl.Rd
index 85417f2d..bddf74b3 100644
--- a/man/popedControl.Rd
+++ b/man/popedControl.Rd
@@ -144,6 +144,7 @@ popedControl(
   opt_a = FALSE,
   opt_x = FALSE,
   opt_samps = FALSE,
+  optTime = TRUE,
   ...
 )
 }
diff --git a/man/popedGetMultipleEndpointModelingTimes.Rd b/man/popedGetMultipleEndpointModelingTimes.Rd
index 7f5bc616..d7c52a4e 100644
--- a/man/popedGetMultipleEndpointModelingTimes.Rd
+++ b/man/popedGetMultipleEndpointModelingTimes.Rd
@@ -39,6 +39,7 @@ indexes in the data.frame
 }
 \examples{
 
+
 \donttest{
 
 times <- c(1.1, 1.2, 1.3, 2.1, 2.2, 3.1)
@@ -58,7 +59,7 @@ modelSwitch <- c(1, 1, 1, 2, 2, 2, 3, 3)
 sortedTimes <- popedGetMultipleEndpointModelingTimes(times, modelSwitch, TRUE)
 print(sortedTimes)
 
-popedMultipleEndpointIndexDataFrame()
+popedMultipleEndpointIndexDataFrame(TRUE) # Print to show individual matching
 
 }
 }
diff --git a/man/popedMultipleEndpointParam.Rd b/man/popedMultipleEndpointParam.Rd
index 09bd672f..97178755 100644
--- a/man/popedMultipleEndpointParam.Rd
+++ b/man/popedMultipleEndpointParam.Rd
@@ -4,7 +4,7 @@
 \alias{popedMultipleEndpointParam}
 \title{Populates Multiple Endpoint Parameters for internal solving}
 \usage{
-popedMultipleEndpointParam(p, times, modelSwitch, maxMT)
+popedMultipleEndpointParam(p, times, modelSwitch, maxMT, optTime = TRUE)
 }
 \arguments{
 \item{p}{A numeric vector of parameters}
@@ -38,7 +38,8 @@ filled with the maximum time.
 }
 }
 \examples{
-\dontrun{
+
+\donttest{
 
 p <- c(1.0, 2.0, 3.0)
 times <- c(0.5, 1.5, 2.5)
diff --git a/man/popedMultipleEndpointResetTimeIndex.Rd b/man/popedMultipleEndpointResetTimeIndex.Rd
index 1c328dec..92d9ef0d 100644
--- a/man/popedMultipleEndpointResetTimeIndex.Rd
+++ b/man/popedMultipleEndpointResetTimeIndex.Rd
@@ -15,7 +15,7 @@ multiple endpoint modeling.
 }
 \examples{
 
-\dontrun{
+\donttest{
 
 popedMultipleEndpointResetTimeIndex()
 
diff --git a/src/poped.cpp b/src/poped.cpp
index 676cef80..b3116229 100644
--- a/src/poped.cpp
+++ b/src/poped.cpp
@@ -52,8 +52,11 @@ timeIndexer globalTimeIndexer;
 //'
 //' @return A numeric vector of unique times.
 //'
+//' @export
+//'
 //' @examples
 //'
+//'
 //' \donttest{
 //'
 //' times <- c(1.1, 1.2, 1.3, 2.1, 2.2, 3.1)
@@ -73,7 +76,7 @@ timeIndexer globalTimeIndexer;
 //' sortedTimes <- popedGetMultipleEndpointModelingTimes(times, modelSwitch, TRUE)
 //' print(sortedTimes)
 //'
-//' popedMultipleEndpointIndexDataFrame()
+//' popedMultipleEndpointIndexDataFrame(TRUE) # Print to show individual matching
 //'
 //' }
 // [[Rcpp::export]]
@@ -101,7 +104,7 @@ Rcpp::NumericVector popedGetMultipleEndpointModelingTimes(Rcpp::NumericVector ti
 //'
 //' @examples
 //'
-//' \dontrun{
+//' \donttest{
 //'
 //' popedMultipleEndpointResetTimeIndex()
 //'
@@ -195,7 +198,8 @@ Rcpp::List popedMultipleEndpointIndexDataFrame(bool print=false) {
 //'    filled with the maximum time.
 //'
 //' @examples
-//' \dontrun{
+//'
+//' \donttest{
 //'
 //' p <- c(1.0, 2.0, 3.0)
 //' times <- c(0.5, 1.5, 2.5)