some more modifications -- to all 3 files