Faster build 2.10