Updated the scaffolding