Implement improvements suggested in facebook post.