Refactored SECD works