final reformat for now