improving scaffold routine