perf improv. but broke bootstrapping