address patrick's and ali's comments from the previous PR