another paranoid commit! more elegant responsiveness