Progress and refactoring