adding all changes made from the blog post