Changes after JPs comments.