revisit-tether update
refactoring