added comments and analytics