updated to accomodate changes in scaffolding