Changes suggested by Anil and Tess