Changes following comments