New changes for bootstrap