Optimize Build Part 2(credits to morfic)