Updated the code to match article tweaks