Adding analytics
fixing merge