Rearranged build order