Beginning changes for bootstrapping