add new stuff and rename