Fix: many fuckups and it's working!!!