took away threading - better implementation this way