Speaker changed

Essentially the same as #32 and #33.