Updated following review comments.