Ny refactoring...