Added feedback from internal review