Updated this PR to resolve our discussion below