more work on Condor scaffolding