Making implementation match blog post.