Make subsequent runs faster