Continuing to synchronize code between b-stats and archive.b-stats