refactoring with fragments, big change