Tweaked code a little, trying to track down fragment issue
Fixed the fragment issues