Updated bootstrap code after merge