I know you're not ok to merge this functionality, but can u just check if I used correctly your macros ?
codeplea
