swithced to single thread implementaiton
project cleaned up