modified original formatter