Attempting faster state updating after bug fix