Fix
Added analytics