Another try at sorting the build