Analytics FINAL update