More work on the manifest creation window