Updated Formatter