improving the tag system