Doubled build + upgrade speed