Added analytics - needs changed