OF-405 Addressing review comments from Simon White