Further modify build order