refactored righthandtracker