Wow nice work !!
Coming back to ACR, and looking at your re-factorings :)