Thanks again for the snippet :)
since you're going to do few more tweaks, few things should be added or being optional.
your efforts are most appreciated :)
Best regards