Updated scaffolding