scaffold and some additions