Finally maybe fixed it good