Updated Formatter for 1.8.5