Addresses comments from Sean and Adrian