more updates to scaffolding