Removed threading for Mac version. Lots of errors