major scaffolding changes