Update bootstrap.py to version 2