updated to use latest lib-noir