Challenge Fragment updates
merge conflict fixed