Changed bootstrap code slightly