second (and last, i hope) commit