tracks tweaks
Revert "tracks tweaks"

This reverts commit f310255f6aec16bdb08bb6714dda7f9b7cac6640.