Added analytics and comments