more work on structure scanning