Rewrote until scoring