Refactoring to fix attack issue.