restructured tagging stuff