Added flux
Added code to reformat intelligently