diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
index c482502..27b923e 100644
--- a/CRAN-SUBMISSION
+++ b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 0.1.4
-Date: 2024-09-21 02:20:31 UTC
-SHA: 7ac75af986b82b17e4403a0727895e5d45e1852f
+Version: 0.1.5
+Date: 2024-10-31 14:57:21 UTC
+SHA: 29222641f45845efa37085c34f29cbb932558aec
diff --git a/cran-comments.md b/cran-comments.md
index a856716..b4a1bf3 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1 +1,18 @@
-- Fixed to only depend on `rxode2` instead of `rxode2parse`
+# babelmixr2 0.1.5
+
+* Fix bug where `PopED` could error with certain `dvid` values
+
+* Fix bug where if/else clauses in the model could cause the model to
+  not predict the values correctly.
+
+* Fix bug so that `shrinkage()` calculation works
+
+* Fix bug so that you can mix 2 different `PopED` data bases in an
+  analysis without crashing R.  While this didn't occur with every
+  database clash, it more frequently occurred when you interleaved
+  `PopED` code between two different `PopED` databases, like in issue
+  #131.
+
+* Added a new function `babelBpopIdx(poped.db, "par")` which will get
+  the poped index for a model generated from `babelmixr2`, which is
+  useful when calculating the power (as in example 11).
diff --git a/tests/testthat/test-convert.R b/tests/testthat/test-convert.R
index 8841b7a..e212576 100644
--- a/tests/testthat/test-convert.R
+++ b/tests/testthat/test-convert.R
@@ -1,5 +1,5 @@
 test_that("nonmem amt=0 evid=1 conversion test", {
-
+  skip_on_cran()
   one.compartment <- function() {
     ini({
       tka <- 0.45 # Log Ka
@@ -32,6 +32,7 @@ test_that("nonmem amt=0 evid=1 conversion test", {
 
 
 test_that("pknca conversion keeps extra columns", {
+  skip_on_cran()
   one.compartment <- function() {
     ini({
       tka <- 0.45 # Log Ka
@@ -211,6 +212,7 @@ test_that("pknca conversion keeps extra columns", {
 })
 
 test_that("getStandardColNames", {
+  skip_on_cran()
   expect_equal(
     getStandardColNames(data.frame(ID=1, DV=2, Time=3, CmT=4)),
     c(id = "ID", time = "Time", amt = NA, rate = NA, dur = NA, evid = NA,
@@ -224,9 +226,9 @@ test_that("getStandardColNames", {
 })
 
 test_that("invalid nonmem conversion", {
-  
+  skip_on_cran()
   skip_if_not(file.exists("bad-nonmem-data-convert.qs"))
-  
+
   d <- qs::qread("bad-nonmem-data-convert.qs")
 
   f <-
@@ -285,5 +287,5 @@ test_that("invalid nonmem conversion", {
   d$tevent <- 0.5
 
   expect_error(bblDatToNonmem(f, d), NA)
-  
+
 })
diff --git a/tests/testthat/test-poped.R b/tests/testthat/test-poped.R
index eecc3e5..bf7eafe 100644
--- a/tests/testthat/test-poped.R
+++ b/tests/testthat/test-poped.R
@@ -1,4 +1,5 @@
-if (requireNamespace("PopED", quietly=TRUE)) {
+if (requireNamespace("PopED", quietly=TRUE) &&
+    identical(Sys.getenv("NOT_CRAN"), "true")) {
 
   pheno <- function() {
     ini({