first refactor gstracker