Added analytics back in