More moving around in an attempt to fix multithreading