better branch tracking