#8 and a bit of #59