Added bootstrapping properly