Okay, I will upload my solution on a new page on this forum, in a couple of minutes.
Since your macros weren't uploaded for me, you can either take the needed parts from my macro and adapt them into yours, or you can upload your macro so I can adapt them.