More work on the bootstrap script to save memory.