added better formating for new phones