implement feedback from @jlee-r7