Final changes

It works!