Jan Hellar is there outstanding work here? There is some feedback in the pr which matches the request from Wojciech Trocki above. Do you need another review there or does it make sense?