SAFE is refactored.