beefed up organizer, added threading