Perf

Increase performances