Corrected build order