SQUASH ME: address more comments