5 days later - Refactored