Updated for small perf