slight changes to scaffolding