Refactored build order.