updated to work with integrated tag parser