Modified Threading Logic