modified scaffold to cover current and future needs