second commit and 3/4 - see changelog