Strengthened/Refactored