Optimized the make a bit better