Too many changes and fix to previous commit
I will never do it again (written 50 times)