... more work to to improve build system ...