added better analytics