more work on tagging