even more work in setup.c again again again