Working on the format a bit more