More scaffold modifications