@trwnh option C I was more tentative on and while it does not solve everything I think it does improve on B. More later.