Faster start up
0.9.6-30