Updated following comments