updates to make things even faster