Rejigging how the bootstrap works