further tweaking of last commit