Before big refactoring.