Updated w/ feedback from internal review