changes to speed up tags