First round fix+more agressive timers