updated format & text