address comments (to be squashed)