a couple of modifications since last weekend