Incorporating review comments from Ox