Add feedback from @jlee-r7