removed threads;
tested; should work