commit befor major changes
Getting rid of thread incompatibilities