More work on scaffolding