changes according to narfbg's request
3 files changed