final bootstrap changes