Bugs in new format

Top