Updated following suggestions