Added changes suggested in initial notes