More aggressive tracking