Perf. updates