more changes copied from Grail
2 files changed