Merged new formatter finally for real