Now with fewer mistakes