updated with additional analytics