Updated to only add points when correct, with tests