Thanks for this suggestion, Christophe. This is a lot of bulky and intricate code - could you explain why it offers a better experience to users of the system than the existing implementation?