Added some bootstrap magic for hw4