Just a few more modifications since last time