Updated to scaffold