Updates after simons code review part 1