Hi,
I regret to say,the new code is not working,but I have attached the "master" spreadsheet which might help you in decision making.