adding better format parsing with tokens