maybe fixed everything.. or atleast something.. need 2 test with some1