We should discuss !

I haven’t see your change before I try to commit, this lead to several
troubles but I solve them. I continued my template function but we
should discuss to integrate all we did ! I guess your way is smarter
and we should decide the template we must edit.