Tag: implement new safeguards