diff --git a/blog.md b/blog.md
index 0310451..7ca9586 100644
--- a/blog.md
+++ b/blog.md
@@ -14,8 +14,16 @@ img:
     <span class="dt-label">Date Posted</span>
 </section>
 <hr class="heading">
-{% for post in site.posts %}
-{% if post.draft == false or jekyll.environment == "development" %}
+
+{% assign draft_posts = site.posts | where: "draft", "true" %}
+{% assign published_posts = site.posts | where: "draft", "false" %}
+
+{% if jekyll.environment == 'development' %}
+{% for post in draft_posts %}
 {% include post_summary.html %}
+{% endfor %}
 {% endif %}
+
+{% for post in published_posts limit:5 %}
+{% include post_summary.html %}
 {% endfor %}
\ No newline at end of file
diff --git a/highlights.md b/highlights.md
index 6573e05..e4f4904 100644
--- a/highlights.md
+++ b/highlights.md
@@ -24,13 +24,17 @@ Welcome to my little home on the web! Below you'll find recent blog posts, proje
 </section>
 
 <hr class="heading">
+
+{% assign draft_posts = site.posts | where: "draft", "true" %}
+{% assign published_posts = site.posts | where: "draft", "false" %}
+
 {% if jekyll.environment == 'development' %}
-{% assign filtered_posts = site.posts %}
-{% else %}
-{% assign filtered_posts = site.posts | where: "draft", "false" %}
+{% for post in draft_posts %}
+{% include post_summary.html %}
+{% endfor %}
 {% endif %}
 
-{% for post in filtered_posts limit:5 %}
+{% for post in published_posts limit:5 %}
 {% include post_summary.html %}
 {% endfor %}