Update to top tagging