A small edit before a big repackage