added better analytics features