removed some threading