Improved (a lot) multiple source edition style