remove threading issue crap