fixing up the scaffolding