Bootstrap update

Almost done