add in safe_parser