fixing tracking
fixed caching