update from Folkers repo