Updated Scaffold