Made a mess trying to fix stuff (works though)