Fixing everything... still working