added comment and analytics