Improved perf
Optimised build