Continued Refactory