Added many new features + analytics