#43 and a bit more