Changes made following comments