modernize for asdf3