FEATURE: adapt thumb threads
BUGFIX: fixed merge conflict