refactored another fragment