adapt to new scaffolding tool