New version of buildsystem