refactored Fragments