@sealtooth for CH11

cr @miniblanchard