Modified formatter