more tweaks for tracking