Refactoring v1.04