Update - Perf improvement