Optimized the build part 2