Final changes before changing everything
It works!