Update PR after Simon's comments