added tagging feature