CHANGED reformatted source for better merging