further tweaking of last commit pt.2