second commit and a half - see changelog