Merged new formatter finally