2 pages refactoring