Work on (and finish) 9.4.2