The new refactoring is working