modify according jrperritt's suggestion
3 files changed