improve 7, commit 1
rename
bugfix