rave fragment minor changes
Merge