Updated formattter