improving fragment logic
Pushing build with better fragment logic