IMPROVED: extend format info