incorporated Simon's review comments