Can now handle more phone number formats and different line names