New, borderless thread design—refactored, too