update for speedup at 2nd time.