Changed build order