WIP: update PR from review (to be squashed)