based off the feedback from the closed PR for #213 I am working on this change
based off the feedback from the closed PR for #213 I am working on this change