changes from ian
3 files changed