even more work in setup.c