More bootstrap code added