Add code to deal with new Wikipedia formatting