I've tried to fix it, and I think it's right now what I share @reggaemuffin, I'm ready for any decision from you and the moderators.