thread enabling and renaming some functions