Final touches

It works