Modified build order