This is the only thing I have to edit before we merge this PR unless you find other things that is not good ;)