Got rid of threading