For me the case is solved and this seems clean

Keeping it still for reference purpose.