Streamline tagging
Add safe period