improve scaffolding
upgrade version