Rewrote streak counting