phase 2 tracking tuning
Merge pull request #3050 from stensokm/phs2trktune

phase 2 tracking tuning