Before re-factor
Before re-factor