diff --git a/.Rbuildignore b/.Rbuildignore
index 5c19be1..072b4d8 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -35,3 +35,4 @@
 ^RoughWork$
 ^CITATION\.cff$
 ^codemeta\.json$
+^cran-comments-archive\.md$
diff --git a/DESCRIPTION b/DESCRIPTION
index 80ba277..84d8334 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -70,4 +70,3 @@ RdMacros:
 Copyright: 2015-2023, ICAR-NBPGR
 Encoding: UTF-8
 RoxygenNote: 7.2.3
-Date: 2023-02-11
diff --git a/README.Rmd b/README.Rmd
index 1817b06..5b8191d 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -153,28 +153,27 @@ osdf$`CRAN check` <- paste("[![CRAN check - ", osdf$Flavour, "]",
                            sep = "")
 ```
 
-```{r, echo = FALSE, results='asis', message=FALSE}
-library(kableExtra, warn.conflicts = FALSE)
 
-kosdf <- kbl(osdf[, c("Flavour", "CRAN check")], row.names = FALSE)
+```{r, echo = FALSE, results='asis'}
+cat("[![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black)](https://cran.r-project.org/web/checks/check_results_germinationmetrics.html)", "\n")
 
-kosdf2 <- kable_styling(kosdf, bootstrap_options = c("striped", "hover"),
-              full_width = F, position = "left")
+knitr::kable(osdf[osdf$OS == "Linux", c(2, 3)], format = "simple", 
+             col.names = c("", ""), 
+             row.names = FALSE)
 
-# os_index <- c(6, 1, 3, 2)
-os_index <- c(6, 3, 2)
+cat("[![Windows](https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logo=windows&logoColor=white)](https://cran.r-project.org/web/checks/check_results_germinationmetrics.html)", "\n")
 
-names(os_index) <- c(paste("[![Linux](https://shields.io/badge/Linux--9cf?logo=Linux&style=social)]",
-                           chklink, sep = ""),
-                     # paste("[![Solaris](https://shields.io/badge/Solaris--9cf?logo=Oracle&style=social)]",
-                     #       chklink, sep = ""),
-                     paste("[![Windows](https://shields.io/badge/Windows--9cf?logo=Windows&style=social)]",
-                           chklink, sep = ""),
-                     paste("[![MacOS](https://shields.io/badge/MacOS--9cf?logo=Apple&style=social)]",
-                           chklink, sep = ""))
+knitr::kable(osdf[osdf$OS == "Windows", c(2, 3)], format = "simple", 
+             col.names = c("", ""),
+             row.names = FALSE)
 
-pack_rows(kosdf2, index = os_index)
+cat("[![MacOS](https://img.shields.io/badge/mac%20os-000000?style=for-the-badge&logo=apple&logoColor=white)](https://cran.r-project.org/web/checks/check_results_germinationmetrics.html)", "\n")
 
+knitr::kable(osdf[osdf$OS == "macOS", c(2, 3)], format = "simple", 
+             col.names = c("", ""),
+             row.names = FALSE)
+
+cat("\n")
 ```
 
 ## Citing `augmentedRCBD`
diff --git a/cran-comments.md b/cran-comments.md
index 0098f5d..c285242 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,3 +1,29 @@
+# Version 0.1.6 - Third submission
+
+* Fixed the issue while reading CITATION file.
+
+### Test environments
+* local Windows 10 Pro 21H2, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* local Ubuntu 20.04, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* win-builder, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* macOS builder, R-release (R 4.3.0).
+
+### R CMD check results
+* There were no ERRORs, WARNINGs.
+
+# Version 0.1.6 - Second submission
+
+* Fixed the wrong date field.
+
+### Test environments
+* local Windows 10 Pro 21H2, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* local Ubuntu 20.04, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* win-builder, R-release (R 4.3.0) & R-devel (R 4.4.0 Pre-release).
+* macOS builder, R-release (R 4.3.0).
+
+### R CMD check results
+* There were no ERRORs, WARNINGs.
+
 # Version 0.1.6 - First submission
 
 ### Test environments
diff --git a/inst/CITATION b/inst/CITATION
index dad1ace..bfad938 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -1,10 +1,6 @@
 
-if(!exists("meta") || is.null(meta)) meta <- packageDescription("augmentedRCBD")
-year <- sub(".*(2[[:digit:]]{3})-.*", "\\1", meta$Date)
-if (!length(year)) {
-  year <- format(packageDate("augmentedRCBD"), "%Y")
-}
-vers <- paste("R package version", meta$Version)
+year <- sub("-.*", "", meta$Date)
+vers <- sprintf("R package version %s", meta$Version)
 
 hd <- "To cite the R package 'augmentedRCBD' in publications use:"
 ft <- paste("This free and open-source software implements academic",