added suggested changes from Raphy and Adam
added changes from Raphy and Adam