Updates to Scaffolding