Adjusted build order